From 5ad9b84e65eafa6e789c1f02b33a3dd86ef3ad44 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Wed, 15 Mar 2006 12:41:58 +0100 Subject: [PATCH] Remove unused macro VMX_CPU_STATE_PG_ENABLED. Use vmx_paging_enabled() instead. Signed-off-by: Xin Li --- xen/arch/x86/hvm/vmx/vmx.c | 7 +++---- xen/include/asm-x86/hvm/vmx/vmcs.h | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 73037cc0d0..fb34b0966d 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -231,10 +231,9 @@ static inline int long_mode_do_msr_write(struct cpu_user_regs *regs) if ((msr_content & EFER_LME) ^ test_bit(VMX_CPU_STATE_LME_ENABLED, &vc->arch.hvm_vmx.cpu_state)){ - if (test_bit(VMX_CPU_STATE_PG_ENABLED, - &vc->arch.hvm_vmx.cpu_state) || - !test_bit(VMX_CPU_STATE_PAE_ENABLED, - &vc->arch.hvm_vmx.cpu_state)){ + if ( vmx_paging_enabled(vc) || + !test_bit(VMX_CPU_STATE_PAE_ENABLED, + &vc->arch.hvm_vmx.cpu_state)) { vmx_inject_exception(vc, TRAP_gp_fault, 0); } } diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 703ae090f3..081b64d773 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -33,8 +33,7 @@ void vmx_relinquish_resources(struct vcpu *v); void vmx_enter_scheduler(void); enum { - VMX_CPU_STATE_PG_ENABLED=0, - VMX_CPU_STATE_PAE_ENABLED, + VMX_CPU_STATE_PAE_ENABLED=0, VMX_CPU_STATE_LME_ENABLED, VMX_CPU_STATE_LMA_ENABLED, VMX_CPU_STATE_ASSIST_ENABLED, -- 2.30.2